Remove uses of deprecated symbols.

2004-11-15  Matthias Clasen  <mclasen@redhat.com>

	* pixbuf-render.c:
	* pixbuf-draw.c:
	* pixbuf-rc-style.c: Remove uses of deprecated symbols.

diff --git a/modules/engines/pixbuf/ChangeLog b/modules/engines/pixbuf/ChangeLog
index 20cf1078bb6e1755a0424597b7dcedc5c7a22fc5..76524a96beeb84b5261a730bfd4aab2365f4f8e9 100644 (file)
--- a/modules/engines/pixbuf/ChangeLog
+++ b/modules/engines/pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * pixbuf-render.c: 
+       * pixbuf-draw.c: 
+       * pixbuf-rc-style.c: Remove uses of deprecated symbols. 
+
 Thu Mar 18 10:07:15 2004  Owen Taylor  <otaylor@redhat.com>
 
        * pixbuf-draw.c (match_theme_image): Fix ./-> typo.

diff --git a/modules/engines/pixbuf/pixbuf-draw.c b/modules/engines/pixbuf/pixbuf-draw.c
index f3eb17d35cd2300cab881919375737c59ce3b290..cababbe38aa6b0f0b69bbbeb05f0679da33b6f24 100644 (file)
--- a/modules/engines/pixbuf/pixbuf-draw.c
+++ b/modules/engines/pixbuf/pixbuf-draw.c
@@ -103,14 +103,14 @@ draw_simple_image(GtkStyle       *style,
   
   if ((width == -1) && (height == -1))
     {
-      gdk_window_get_size(window, &width, &height);
+      gdk_drawable_get_size(window, &width, &height);
       if (allow_setbg)
        setbg = TRUE;
     }
   else if (width == -1)
-    gdk_window_get_size(window, &width, NULL);
+    gdk_drawable_get_size(window, &width, NULL);
   else if (height == -1)
-    gdk_window_get_size(window, NULL, &height);
+    gdk_drawable_get_size(window, NULL, &height);
 
   if (!(match_data->flags & THEME_MATCH_ORIENTATION))
     {
@@ -166,13 +166,13 @@ draw_gap_image(GtkStyle       *style,
   
   if ((width == -1) && (height == -1))
     {
-      gdk_window_get_size(window, &width, &height);
+      gdk_drawable_get_size(window, &width, &height);
       setbg = TRUE;
     }
   else if (width == -1)
-    gdk_window_get_size(window, &width, NULL);
+    gdk_drawable_get_size(window, &width, NULL);
   else if (height == -1)
-    gdk_window_get_size(window, NULL, &height);
+    gdk_drawable_get_size(window, NULL, &height);
 
   if (!(match_data->flags & THEME_MATCH_ORIENTATION))
     {

diff --git a/modules/engines/pixbuf/pixbuf-rc-style.c b/modules/engines/pixbuf/pixbuf-rc-style.c
index 22f394145547e98eea6e21e4e2e623d67b80f63c..e90cee19ede1b769cf825b9c8ca6eed72b0c6140 100644 (file)
--- a/modules/engines/pixbuf/pixbuf-rc-style.c
+++ b/modules/engines/pixbuf/pixbuf-rc-style.c
@@ -723,12 +723,10 @@ pixbuf_rc_style_parse (GtkRcStyle *rc_style,
 
   if (!g_scanner_lookup_symbol(scanner, theme_symbols[0].name))
     {
-      g_scanner_freeze_symbol_table(scanner);
       for (i = 0; i < G_N_ELEMENTS (theme_symbols); i++)
        g_scanner_scope_add_symbol(scanner, scope_id,
                                   theme_symbols[i].name,
                                   GINT_TO_POINTER(theme_symbols[i].token));
-      g_scanner_thaw_symbol_table(scanner);
     }
 
   /* We're ready to go, now parse the top level */

diff --git a/modules/engines/pixbuf/pixbuf-render.c b/modules/engines/pixbuf/pixbuf-render.c
index c449da3734385fbafeddd8ab34516b7e39afe7eb..08baf939b4d88b70e382f35ad326b78f5f3c02ca 100644 (file)
--- a/modules/engines/pixbuf/pixbuf-render.c
+++ b/modules/engines/pixbuf/pixbuf-render.c
@@ -409,7 +409,7 @@ pixbuf_render (GdkPixbuf    *src,
                        x_scale, y_scale,
                        GDK_INTERP_BILINEAR);
 
-      gdk_pixbuf_unref (partial_src);
+      g_object_unref (partial_src);
 
       x_offset = 0;
       y_offset = 0;
@@ -431,7 +431,7 @@ pixbuf_render (GdkPixbuf    *src,
                                       GDK_PIXBUF_ALPHA_FULL, 128,
                                       GDK_RGB_DITHER_NORMAL,
                                       0, 0);
-  gdk_pixbuf_unref (tmp_pixbuf);
+  g_object_unref (tmp_pixbuf);
 }
 
 ThemePixbuf *
@@ -661,7 +661,7 @@ theme_pixbuf_get_pixbuf (ThemePixbuf *theme_pb)
     {
       if (!pixbuf_cache)
        pixbuf_cache = g_cache_new ((GCacheNewFunc)pixbuf_cache_value_new,
-                                   (GCacheDestroyFunc)gdk_pixbuf_unref,
+                                   (GCacheDestroyFunc)g_object_unref,
                                    (GCacheDupFunc)g_strdup,
                                    (GCacheDestroyFunc)g_free,
                                    g_str_hash, g_direct_hash, g_str_equal);
@@ -797,7 +797,7 @@ theme_pixbuf_render (ThemePixbuf  *theme_pb,
            gdk_draw_rectangle (window, tmp_gc, TRUE, x, y, width, height);
          
          gdk_gc_unref (tmp_gc);
-         gdk_pixmap_unref (tmp_pixmap);
+         g_object_unref (tmp_pixmap);
        }
     }
 }